Skip to content

chore: automation of rebasing open non dependabot PRs with develop branch - #1252

Merged
yoganandaness merged 1 commit into
developfrom
chore/pr-auto-dev-rebase
Nov 4, 2025
Merged

chore: automation of rebasing open non dependabot PRs with develop branch#1252
yoganandaness merged 1 commit into
developfrom
chore/pr-auto-dev-rebase

Conversation

@yoganandaness

Copy link
Copy Markdown
Contributor

Description

This PR introduces a GitHub Actions workflow to automatically rebase all open non-bot pull requests on top of the develop branch whenever develop receives new commits.
The workflow helps keep PRs up to date and reduces manual rebasing. When there is a conflict during this process, this abort the rebase and write a comment in the PR.

Motivation and Context

Currently, whenever develop is updated, all open PRs get outdated, requiring manual rebasing and triggering long E2E tests.
This workflow automates that process, ensuring PRs remain current and reducing the overhead on contributors and CI.

How Has This Been Tested

  • The workflow was tested on a fork repository with multiple open PRs.
  • Verified that non-bot PRs were rebased onto the latest develop commit automatically.
  • Conflicts were correctly detected and commented on the respective PRs.
  • Confirmed that force pushes (--force-with-lease) work safely for rebased PRs.

Fixes

  • No functional code changes. This PR improves CI/PR management processes.

Changes

  • Added a new GitHub Actions workflow .github/workflows/rebase-prs-with-develop.yml.
  • The workflow:
    • Triggers on push to develop.
    • Checks out all open non-bot PRs.
    • Attempts to rebase them on top of develop.
    • Pushes rebased branches automatically if no conflicts.
    • Comments on PRs where automatic rebase fails due to conflicts.

Depends on

  • None. This workflow operates independently of other PRs.

Tests included/Docs Updated?

  • I have added tests to cover my changes.
  • All relevant doc has been updated

@yoganandaness
yoganandaness requested a review from a team as a code owner November 4, 2025 10:46
@yoganandaness
yoganandaness requested review from bashanlam and removed request for a team November 4, 2025 10:46
@yoganandaness
yoganandaness merged commit 34d6064 into develop Nov 4, 2025
42 of 43 checks passed
@yoganandaness
yoganandaness deleted the chore/pr-auto-dev-rebase branch November 4, 2025 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants